Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update RLS and rustfmt #84103

Merged
merged 1 commit into from
Apr 12, 2021
Merged

Conversation

calebcartwright
Copy link
Member

Fixes #83460 and fixes #83459

cc @Xanewok

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2021
@Mark-Simulacrum
Copy link
Member

@bors delegate+

r=me

@bors
Copy link
Contributor

bors commented Apr 11, 2021

✌️ @calebcartwright can now approve this pull request

@calebcartwright
Copy link
Member Author

calebcartwright commented Apr 11, 2021

@Xanewok - I think RLS would need rust-lang/rls#1725 in order to address the build issue, would it be possible to get that merged, and/or is there a different branch/tag/etc. in RLS I should update the submod to instead?

error[E0432]: unresolved import `cargo::util::ProcessBuilder`
  --> src/tools/rls/rls/src/build/cargo.rs:19:18
   |
19 |     ConfigValue, ProcessBuilder,
   |                  ^^^^^^^^^^^^^^ no `ProcessBuilder` in `util`

error[E0432]: unresolved import `cargo::util::ProcessBuilder`
  --> src/tools/rls/rls/src/build/cargo_plan.rs:25:5
   |
25 | use cargo::util::ProcessBuilder;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `ProcessBuilder` in `util`

error[E0432]: unresolved imports `cargo::util::process`, `cargo::util::ProcessBuilder`
  --> src/tools/rls/rls/src/build/external.rs:26:19
   |
26 | use cargo::util::{process, ProcessBuilder};
   |                   ^^^^^^^  ^^^^^^^^^^^^^^ no `ProcessBuilder` in `util`
   |                   |
   |                   no `process` in `util`
   |                   help: a similar name exists in the module: `progress`

error[E0432]: unresolved import `cargo::util::ProcessBuilder`
  --> src/tools/rls/rls/src/build/plan.rs:15:5
   |
15 | use cargo::util::ProcessBuilder;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `ProcessBuilder` in `util`

error[E0433]: failed to resolve: could not find `paths` in `util`
   --> src/tools/rls/rls/src/build/cargo.rs:269:18
    |
269 |     cargo::util::paths::create_dir_all_excluded_from_backups_atomic(
    |                  ^^^^^ could not find `paths` in `util`

error[E0560]: struct `CompileOptions` has no field named `features`
   --> src/tools/rls/rls/src/build/cargo.rs:232:9
    |
232 |         features: opts.features,
    |         ^^^^^^^^ `CompileOptions` does not have this field
    |
    = note: available fields are: `build_config`, `cli_features`, `spec`, `filter`, `target_rustdoc_args` ... and 4 others

error[E0560]: struct `CompileOptions` has no field named `all_features`
   --> src/tools/rls/rls/src/build/cargo.rs:233:9
    |
233 |         all_features: opts.all_features,
    |         ^^^^^^^^^^^^ help: a field with a similar name exists: `cli_features`

error[E0560]: struct `CompileOptions` has no field named `no_default_features`
   --> src/tools/rls/rls/src/build/cargo.rs:234:9
    |
234 |         no_default_features: opts.no_default_features,
    |         ^^^^^^^^^^^^^^^^^^^ `CompileOptions` does not have this field
    |
    = note: available fields are: `build_config`, `cli_features`, `spec`, `filter`, `target_rustdoc_args` ... and 4 others

error[E0271]: type mismatch resolving `<std::collections::btree_map::Iter<'_, std::string::String, std::option::Option<OsString>> as Iterator>::Item == (_, std::option::Option<_>)`
   --> src/tools/rls/rls/src/build/cargo.rs:491:23
    |
491 |         for (k, v) in &envs {
    |                       ^^^^^ expected reference, found enum `std::option::Option`
    |
    = note: expected tuple `(&std::string::String, &std::option::Option<OsString>)`
               found tuple `(_, std::option::Option<_>)`

error[E0283]: type annotations needed
   --> src/tools/rls/rls/src/build/cargo_plan.rs:53:5
    |
44  |   #[derive(Debug, Default)]
    |                   ------- in this macro invocation
...
53  |       pub(crate) compiler_jobs: HashMap<UnitKey, ProcessBuilder>,
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
    | 
   ::: /checkout/library/core/src/default.rs:167:1
    |
167 | / pub macro Default($item:item) {
168 | |     /* compiler built-in */
169 | | }
    | |_- in this expansion of `#[derive(Default)]`
    |
    = note: cannot satisfy `_: std::default::Default`
    = note: required by `std::default::Default::default`

error[E0061]: this function takes 8 arguments but 7 arguments were supplied
   --> src/tools/rls/rls/src/project_model.rs:220:5
    |
220 |     ops::resolve_with_previous(registry, ws, &ResolveOpts::everything(), prev, None, &[], true)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ --------  --  --------------------------  ----  ----  ---  ---- supplied 7 arguments
    |     |
    |     expected 8 arguments
    |
note: function defined here
   --> /checkout/src/tools/cargo/src/cargo/ops/resolve.rs:206:8
    |
206 | pub fn resolve_with_previous<'cfg>(
    |        ^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 11 previous errors

Some errors have detailed explanations: E0061, E0271, E0283, E0432, E0433, E0560.
For more information about an error, try `rustc --explain E0061`.
error: could not compile `rls`

To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/rls/Cargo.toml" "--features" "clippy, rustc-workspace-hack/all-static" "--message-format" "json-render-diagnostics"
expected success, got: exit code: 101
failed to test rls: could not build

@rust-log-analyzer

This comment has been minimized.

@Xanewok
Copy link
Member

Xanewok commented Apr 12, 2021

@calebcartwright rust-lang/rls#1725 is now merged, could you try using latest RLS master?

@rust-log-analyzer

This comment has been minimized.

@ehuss
Copy link
Contributor

ehuss commented Apr 12, 2021

You'll need to update the patch list here to include cargo-util = { path = "src/tools/cargo/crates/cargo-util" }

@calebcartwright
Copy link
Member Author

You'll need to update the patch list here to include cargo-util = { path = "src/tools/cargo/crates/cargo-util" }

Yup had just found that a little while ago as well 👍

@Xanewok
Copy link
Member

Xanewok commented Apr 12, 2021

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 12, 2021

📌 Commit e2fe4f2 has been approved by Xanewok

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2021
@bors
Copy link
Contributor

bors commented Apr 12, 2021

⌛ Testing commit e2fe4f2 with merge 1284da3...

@bors
Copy link
Contributor

bors commented Apr 12, 2021

☀️ Test successful - checks-actions
Approved by: Xanewok
Pushing 1284da3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2021
@bors bors merged commit 1284da3 into rust-lang:master Apr 12, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 12, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #84103!

Tested on commit 1284da3.
Direct link to PR: #84103

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @calebcartwright @topecongiro).
🎉 rustfmt on linux: build-fail → test-pass (cc @calebcartwright @topecongiro).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 12, 2021
Tested on commit rust-lang/rust@1284da3.
Direct link to PR: <rust-lang/rust#84103>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @calebcartwright @topecongiro).
🎉 rustfmt on linux: build-fail → test-pass (cc @calebcartwright @topecongiro).
@calebcartwright calebcartwright deleted the bump-rls-rustfmt branch October 20, 2021 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#83454 rls no longer builds after rust-lang/rust#83454
8 participants